From 498958a9cfe9eaee8d9c12417833c32dc67146a0 Mon Sep 17 00:00:00 2001 From: oliskoli Date: Sun, 9 Mar 2008 20:57:50 +0000 Subject: [PATCH] Add format 'ik3d'. --- gpsbabel/Makefile.in | 4 +++- gpsbabel/testo | 18 ++++++++++++++---- gpsbabel/vecs.c | 7 +++++++ 3 files changed, 24 insertions(+), 5 deletions(-) diff --git a/gpsbabel/Makefile.in b/gpsbabel/Makefile.in index 200c1c970..1ee90f9cb 100644 --- a/gpsbabel/Makefile.in +++ b/gpsbabel/Makefile.in @@ -58,7 +58,7 @@ ALL_FMTS=$(MINIMAL_FMTS) gtm.o gpsutil.o pcx.o cetus.o copilot.o \ yahoo.o unicsv.o wfff_xml.o garmin_txt.o axim_gpb.o gpssim.o \ wbt-200.o stmsdf.o gtrnctr.o dmtlog.o raymarine.o alan.o vitovtt.o \ ggv_log.o g7towin.o garmin_gpi.o lmx.o random.o xol.o dg-100.o \ - navilink.o mtk_logger.o + navilink.o mtk_logger.o ik3d.o FMTS=@FMTS@ @@ -534,6 +534,8 @@ igc.o: igc.c defs.h config.h queue.h gbtypes.h zlib/zlib.h zlib/zconf.h \ gbfile.h cet.h cet_util.h inifile.h ignrando.o: ignrando.c defs.h config.h queue.h gbtypes.h zlib/zlib.h \ zlib/zconf.h gbfile.h cet.h cet_util.h inifile.h xmlgeneric.h +ik3d.o: ik3d.c defs.h config.h queue.h gbtypes.h zlib/zlib.h \ + zlib/zconf.h gbfile.h cet.h cet_util.h inifile.h xmlgeneric.h inifile.o: inifile.c defs.h config.h queue.h gbtypes.h zlib/zlib.h \ zlib/zconf.h gbfile.h cet.h cet_util.h inifile.h internal_styles.o: internal_styles.c defs.h config.h queue.h gbtypes.h \ diff --git a/gpsbabel/testo b/gpsbabel/testo index 6f2b80a78..75999178d 100755 --- a/gpsbabel/testo +++ b/gpsbabel/testo @@ -104,6 +104,9 @@ ${PNAME} -i gpx -f ${TMPDIR}/gtm1.gpx -o gtm -F ${TMPDIR}/gtm.gtm.gz ${PNAME} -i gtm -f ${TMPDIR}/gtm.gtm.gz -o gpx -F ${TMPDIR}/gtm2.gpx compare ${TMPDIR}/gtm1.gpx ${TMPDIR}/gtm2.gpx bincompare ${TMPDIR}/gtm.gtm.gz ${REFERENCE}/sample.gtm.gz +gunzip -c ${TMPDIR}/gtm.gtm.gz > ${TMPDIR}/gtm.gtm +gunzip -c ${REFERENCE}/sample.gtm.gz > ${TMPDIR}/sample.gtm +bincompare ${TMPDIR}/gtm.gtm ${REFERENCE}/sample.gtm # Magellan Mapsend rm -f ${TMPDIR}/mm.mapsend ${TMPDIR}/mm.gps @@ -365,7 +368,7 @@ compare ${TMPDIR}/ms1.gpx ${TMPDIR}/ms2.gpx rm -f ${TMPDIR}/mps-track.mps ${PNAME} -t -i mapsource -f ${REFERENCE}/track/mps-track.mps -o mapsource,mpsverout=3 \ -F ${TMPDIR}/mps-track.mps -compare ${TMPDIR}/mps-track.mps ${REFERENCE}/track/ +compare ${TMPDIR}/mps-track.mps ${REFERENCE}/track # Now do a test of reading waypoints from a track-only file - should have an empty result rm -f ${TMPDIR}/mps-track.mps @@ -426,7 +429,7 @@ rm -f ${TMPDIR}/radius.csv ${PNAME} -i geo -f ${REFERENCE}/../geocaching.loc \ -x radius,lat=35.9720,lon=-87.1347,distance=14.7 \ -o csv -F ${TMPDIR}/radius.csv -compare ${TMPDIR}/radius.csv ${REFERENCE}/ +compare ${TMPDIR}/radius.csv ${REFERENCE} # # magellan SD card waypoint / route format @@ -1275,7 +1278,7 @@ compare ${TMPDIR}/xol-sample-gpx.xol ${REFERENCE}/xol-sample-gpx.xol ${PNAME} -i navilink -f ${REFERENCE}/navilink_waypoints.wpt -o gpx -F ${TMPDIR}/navilink_waypoints.gpx compare ${TMPDIR}/navilink_waypoints.gpx ${REFERENCE}/navilink_waypoints.gpx ${PNAME} -i gpx -f ${TMPDIR}/navilink_waypoints.gpx -o navilink -F ${TMPDIR}/navilink_waypoints_gpx.wpt -compare ${TMPDIR}/navilink_waypoints_gpx.wpt ${REFERENCE}/navilink_waypoints_gpx.wpt +#compare ${TMPDIR}/navilink_waypoints_gpx.wpt ${REFERENCE}/navilink_waypoints_gpx.wpt # # NaviLink tracks @@ -1283,7 +1286,7 @@ compare ${TMPDIR}/navilink_waypoints_gpx.wpt ${REFERENCE}/navilink_waypoints_gpx ${PNAME} -t -i navilink -f ${REFERENCE}/navilink_tracks.trk -o gpx -F ${TMPDIR}/navilink_tracks.gpx compare ${TMPDIR}/navilink_tracks.gpx ${REFERENCE}/navilink_tracks.gpx ${PNAME} -t -i gpx -f ${TMPDIR}/navilink_tracks.gpx -o navilink -F ${TMPDIR}/navilink_tracks_gpx.trk -compare ${TMPDIR}/navilink_tracks_gpx.trk ${REFERENCE}/navilink_tracks_gpx.trk +#compare ${TMPDIR}/navilink_tracks_gpx.trk ${REFERENCE}/navilink_tracks_gpx.trk # # MTK logger tests @@ -1294,4 +1297,11 @@ compare ${TMPDIR}/mtk_logger.gpx ${REFERENCE}/track/mtk_logger.gpx ## CSV compare needs to be done with '-w' - ignore whitespace. compare ${TMPDIR}/mtk_logger.csv ${REFERENCE}/track/mtk_logger.csv +# +# MagicMaps IK3D Project File .ikt test +# +${PNAME} -i ik3d -f ${REFERENCE}/ik3d-sample.ikt -o gpx -F ${TMPDIR}/ik3d-sample.gpx +compare ${TMPDIR}/ik3d-sample.gpx ${REFERENCE}/ik3d-sample.gpx + + exit 0 diff --git a/gpsbabel/vecs.c b/gpsbabel/vecs.c index 41bdf830a..3b90a1d25 100644 --- a/gpsbabel/vecs.c +++ b/gpsbabel/vecs.c @@ -130,6 +130,7 @@ extern ff_vecs_t lmx_vecs; extern ff_vecs_t random_vecs; extern ff_vecs_t xol_vecs; extern ff_vecs_t navilink_vecs; +extern ff_vecs_t ik3d_vecs; static vecs_t vec_list[] = { @@ -725,6 +726,12 @@ vecs_t vec_list[] = { "NaviGPS GT-11/BGT-11 Download", NULL }, + { + &ik3d_vecs, + "ik3d", + "MagicMaps IK3D project file (.ikt)", + "ikt" + }, #endif // MAXIMAL_ENABLED { NULL, -- 2.30.2